bitkeeper revision 1.1159.1.500 (41c9ced6bi_22nPlm0WqxtYuPUpiTw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 19:45:26 +0000 (19:45 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 19:45:26 +0000 (19:45 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge